LPS-41662 Revert as it's breaking tests