Revert "Merge conflict issues"

This reverts commit aef083af22d2e04932202ef81ba97dbb87836cc1, reversing
changes made to e5b3115f6b1ee214fd0d9298887de8d36762f64a.