Revert "Resolved merge conflict :)"

This reverts commit 1002fc93a4a81b27a32e633954ef22c6442bab68, reversing
changes made to 05a469aff651d8fa7923b7501e15a0e06a30c204.