Revert r191834 until we measure the effect of this benchmarks and maybe find a better way to fix it