LPS-36620 

This is only reverting commit 339e445b17f9dae10c3aec3acebfd98a6f4c86fd / LPS-36567 . So minimal change has been done. I have tested this with ee-6.1.x branch

CC: @rotty3000 @holatuwol