Rolling back Rubin's patch as it has no effect anyway