This reverts commit aa21020218a2dcd29a03444ad2a77f03f085b04e. Regression was fixed by e4367c571f.
e4367c571f