Revert
Merge pull request #71 from carlacummins/farm3

Revert