Revert seemingly cosmetic changes that caused g1wr not to be called
Resolve minor merge conflict