It doesn't matter if you're running both at the same time or not. If you have a port forwarded manually, it can ONLY forward to one machine at a time, regardless. Use different ports on different machines. The knee-jerk reaction of rolling back is not a solution to problems.