This change is now on master (e2d702e)