Turns out it didn't fix test failures like I thought. It only added more! This reverts commit b8221c6b.
