LPS-39793

Tomas' commit basically negates:

5e81c9af59137d3d1cca0a46774d2bcf10411327

More work needs to be done on it. Contacted Tomas and reverting for now.