Going to push this to 5.0.3. I do not like this much, but I am not sure there is a better way in 5.0. So I wanted to think about this some more