Revert "merge resolve"

This reverts commit b79fecb0379d6913aa4fb1373545ddd9f4ba604d, reversing
changes made to 7912319fc34a31ce91278a977a6087fd69b7af15.