LPS-43772 Rollback LPS-41388