Took me two days to find this, breaking our complete test suite.
Simplify
Fix tests.