Revert "Conflict"

This reverts commit 495ba04476a33ca325201ede41764c5b15b0de48, reversing
changes made to 20dd9f986bf067558a5d5d7794eff8e572974861.