It was being done in inconsistent ways in several places, which did not include all of the places it needed to be done. Closes #1509. Originally committed to SVN as r6960.
Originally committed to SVN as r6959.