Reverting LPS-49443

Please use this PR if you want to go back to original status, thanks