This reverts commit 6aab7094. Some users have failing builds with ShapeCanonicalization.td, so revert for now.