cc09c0d048
This reverts commit ad35fa1993, it had
unintended side-effects (T82312).
This reverts commit ad35fa1993, it had
unintended side-effects (T82312).