Revert "Merge pull request #1818 from jawj/master"

This reverts commit a57169012adee5e4f40d062df57ddcd9e1dcf23e, reversing
changes made to be486a280a8c86eab819505c63216c6c69d8b473.