revert part of the previous cleanup - it only applies
to the 7.0 branch
1 file changed