Removed left-over code that would cause the logic from bug #2035 to not work.