Revert "Merge branch 'noff'"

This reverts commit 5c7c6f2a3a36da0afc5c070f0b7faccbe76131be, reversing
changes made to bdd3996d38d885e18e5c5960df1c2c06e34d673f.