Revert "capture canonical again"

This reverts commit de12c436121deec2d802cadcbc37a4e5c80f17d9.