These changes shouldn't be in this pull unless the goal is to make the entire app 1.5 compliant.