Revert "committing merges"

This reverts commit afc1ae7c52f60c60221a8d19f54c996cecafe1cd, reversing
changes made to 48d81fb27ef793a794d3131f519921b529ebf649.