Revert "Needs reverting"

This reverts commit 4e24b81f0c682fbff9ad13f9da32248a5b4a2a3b.
Test