Revert "Merge branch 'pete-method' into belt-and-suspenders"

This reverts commit d3d86bd5600e552dfc042fff6d593bf3ff094251, reversing
changes made to bf6236dc4b5025b23d25a4e1786f28e4024a253d.