Revert "Resolved merge conflict"

This reverts commit dffc145adfcda8834fb49b693881cbdeefcaeac1, reversing
changes made to df65e526452058f53991d125b1bf7d37ffffafc2.