This reverts commit 1a35d6544b. This has not actually fixed the issue completely. See follow up commit
1a35d6544b