Revert commit 142891. Takumi bisected the tablegen miscompiles