Revert 54821. It's miscompiling 252.eon and 447.dealII