Eric said I did too much work

This reverts commit d5b3f7103359587ad60b5f71b31454f6e6dc71ba.