Revert "Resolved conflicts"

This reverts commit 17e056d7e9d4601131adc8785651a4a4d56fe6c2, reversing
changes made to c1596095ac9f7de4489a2e169759c1bc0d4ff560.