BZ-1018535: reverting an incorrect change