Revert "Merge branch 'hotfix'"

This reverts commit 961818397607ffe2c4e0ae6ad92f922d4309fdbc, reversing
changes made to 7a53cda01685c176d9a91aa0e24f188192548731.