ok, the hack is no longer needed in master