Bring Randm's patch to the old bits