Revert "merge"

This reverts commit 33087133d3e3de814eedc6079533d7ce9724de6b, reversing
changes made to 918f06eebf22ab6f582abbb9b59d07c7c745333c.