Revert "Merge pull request #1 from acbrewbaker/Aaron"

This reverts commit b7f63f042d01f44b725a478d8598735e56b317be, reversing
changes made to a4e98f0c28b233084d1bbbc9502bcbbc879613b3.