LPS-48373 revert d5db0bdf2701f536ed38e21444fe5c4081f3d4a0 - It seems it is really needed :)
LPS-48373 SF