LPS-42158 Undo LPS-24255