Revert "merging cleanups"

This reverts commit 375cb95e232029ae46ef49a277181741901a7095, reversing
changes made to 9cef04347cbd0da2bebb97fea8a1c3ac3942dfb8.