I don't think this PR should be making this kind of a change.  Why does this need to be changed?