Revert "Merge pull request #3202 from cottsay/master"

This reverts commit e22aec5a3cce694af55158acfed64793622e7e85, reversing
changes made to 527416aedc4b26736fb06dce3cadc6d8489ecb2f.