LPS-42800

Hey Hugo,

This is a partial revert of LPS-30383. Let me know if it needs to be done differently.

Thanks.