This reverts commit 6ddb35c3c400586520b0f1e39f6f5369d0f61b44. A hotfix has been deployed, lets see how it goes.