LPS-43943 Partial rollback of LPS-42599 (1401f1a)