MDL-44053 question restore from 2.0: fix regression from MDL-43670