This reverts commit 105ed27ed80dd47a9d32e72bbdd2a776a3318f38, and removes the offending line from the tests.