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