This reverts commit 198acb8e39c317a88dab5293b7ccf2037d24e2aa. I'm reverting this until I fix the issue properly.