Revert "forcefully break tests"

This reverts commit 0f880d5f72312b39f269a80da0e50591cf344068.