Revert "Preserve canonical labels as such (#1863)"

This reverts commit 2b326f8102c53db93c1fb330136bc5ed428e6cf0.
2 files changed