This ended up being non-trivial. So I am rolling my work back. Sanne Grinovero, if you get a chance to do this before I start the 5.0.3 release tomorrow we can get it included in there. If not I'll push it until 5.0.4.