This reverts commit d7bbb123. There were follow up uses of a deleted method and I didn't run the tests. Undo the revert, so I can do it properly.