Revert "Merge branch 'conflicts'"

This reverts commit 3c47ed7998e5f64b8ada4cfad4b48da889bef717, reversing
changes made to 08e7a0f75d3e245e48a3803f5c5709c51d775e12.