Remove dependency on a future patch