Revert d12ac58..8709e4f

This rolls back to commit d12ac586d9b1e1c51bede1064a7ede3f47ac608a.
Revert "Merge pull request #1 from freeformz/master"

This reverts commit d12ac586d9b1e1c51bede1064a7ede3f47ac608a, reversing
changes made to 83ca9f5141c1fdcb626820b1601c406e3a3a560a.