This reverts commit 0a554e60. Some users have build failures when building ShapeCanonicalization.td, so revert changes that created and rely on it.