Undo the pull request; it broke my test setup