Add back style change lost in mergetool. MJ-580