LPS-41253 Revert