This code is a direct port from 2.x, If it hasn't been a problem in all this time I guess it is fine to leave it like that