Restore some styling lost in the revert merge-conflict.