This reverts commit 935a9ce797.
935a9ce797
We have to check whether the hacks are still needed or not