This reverts commit 9a0f341a6798a7a4be874e50857b5b659e7812e4, reversing changes made to 8ddb6e4e6062fbece3ad3556059139c9eba30286. Revert until fully investigated