revert: regression brought in commit# 5e6c7a4c73e222859fcd7dd84c95ee077883c821