Temporary patch removed