I've been meaning to do this for awhile and never had a good reason to bite the bullet and fix it everywhere. I had to for this ticket.