Revert again as there is still a problem it seems

This reverts commit 5772b53325e725472ed7b8afab81a803facdcb41.