Will this ever be merged upstream?