Revert "Merge fixes"

This reverts commit 272097483051d58071d65ecbf336f9d041e85cbf.