Would be good to try and get this upstream.