Revert "resolved merge conflicts"

This reverts commit 7f16be9b84e3dd2ec4c15f8780aa028fa6ffb79a, reversing
changes made to aed4c372ed70d661357308b43bbf2a370ce74df0.