Revert "DO NOT PULL THIS COMMIT TESTS ARE INTENTIOANLLY BROKEN"

This reverts commit 3c0e6d659ce7ee61cdf34447cbde5dd662fa5641.