Revert "Merge"

This reverts commit 6d26fff26f96b683629d30b2f712e6b5f7c4d51e, reversing
changes made to 1bf9747c8be593ce052560386a72f96301b1c5ff.