Revert "merge"

This reverts commit c12fa4e3e09986269cac8148db54a0b03b75d9fc, reversing
changes made to 81e44bba2b05774f13a5e142493a14d7904c771a.