Revert "Merge pull request #2 from wilsonhobbs/rfair/messupgreeps"

This reverts commit f178ed1b0dc5a7b5239af2806f31cd7684c87ca1, reversing
changes made to cba299a9ecf4f075f59f5b2315f5301b163a9793.