Reverted #540
Merge pull request #732 from eightyeight/revert-540

Revert #540