Revert "Needs reverting"

This reverts commit 55b88de83bc0392b31cd812fc65125831d322ad9.
Test