Revert "Merge commit 'a66b51d'"

This reverts commit 420228b3a52ed340986d54dbe4ad065a352b6c51, reversing
changes made to a66b51d8560fcfb21d39884b628fd586f76c83e9.