Revert "Merge branch 'Patrick's-Branch'"

This reverts commit 2fa7c31f19f74ee7a952b8350085ad998d9a6d38, reversing
changes made to a46cb608d7a49fd902cadb336ded5b3e7b8be5ca.