TRUNK-3944: Reverting back downgrade