Dennis was right :)

This reverts commit 4f4dd6647b6391f87d1c1813aeb7a4e8d798b4ba.