BZ-1018535: reverting one more bad change