Reverting change made in last revision. It intended to fix a bug for a particular test case (don't know anymore which one!) but it actually broke most other cases.