Revert "Merge?"

This reverts commit 2bf74a0e253e3722d87a0bd814dd301303263c9a, reversing
changes made to 89e4d43993ab7f8328584ba13e891a6e9d14893f.

Reverse Merge?