This breaks the build and 848eaf76 only partially fixed that. This reverts commit d45bc25e.
(Don't bother reviewing. This MR is only for verifying CI.)