I'm fairly certain this was a bug to begin with and should be changed regardless if this PR is accepted.