We simply reverted it in #3552 as that was faster.