ok, so I wrote #2711 for you :)

Fancy merging it in and using it?