Did this ever get submitted upstream?