I wasn't sure what was happening here at first and thought it was undoing @smbarne commit.  Looking at it a second time I think this is OK, we do want to keep the contentMode the same.