Revert "Resolved merge conflicts"

This reverts commit aadd3b91feadbc0dc66e708e18560167b650737c, reversing
changes made to d794c72b71f93ca7782dbe30e3504da092d4f1ee.