Revert back to vesion dcb8b68ada4f8e05ad124203b1ab401838fc5a34 due to erroneous fix in latest version of canonizer.c