This potentially related to https://bugs.llvm.org/show_bug.cgi?id=46335 and causes a slight compile-time regression. Revert while investigating. This reverts commit d99a1848c4f8ca164c0c0768e10eafc850b2a68a.