Revert "Am I doin it right?"

This reverts commit 92368ee0ed82501de3f6eac61936e0c8ea225964, reversing
changes made to 371f61045d42f81f3656ac3087563747d11334ce.