Undo of an erroneous change.
Merge branch 'case-2428' into develop