Revert "hm.  I wonder how I get back to the other branch?"

This reverts commit d6585071c9fc41a1c3d2f4689e89823c340bbad1.