This reverts commit 0e0eb9001a901bf17f541efea297deb385fb09b8. Introduces new issues... revert until it's fixed properly.