SOS-1578 Partial reverse (reverse-merged from commit 7f8c8f143441e015e79ee6b0a6d5e90b7545761e) since removing these properties will cause problem in 6.1.x, even it fixes issue in 6.2