Revert "Merge pull request #47 from PKChrisChan/farenChanges"

This reverts commit fd85fcc108e2913592fc35a0ee4f9314ed1cc488, reversing
changes made to db37a11c220ef27cb42d9589b11591e8e8594735.