This reverts part of 91497348bf
91497348bf
Otherwise we infinitely end up with the error again. Testcases added.