Would be nice to see if this ever went upstream?