Revert "Merge pull request #2052 from showkit/master"

This reverts commit efa21e991603689ca47f869035ff652706493dac, reversing
changes made to d42c2e09cf5754edcba639da4d6c3f320535d501.