Revert "Resolved conflicts"

This reverts commit e708588229bd99ea55ae51e060f799a2406310ce, reversing
changes made to 0e67c3d731e69507be7dcdacd60a9e218f8e1fbf.