LPS-39901 Rollback of LPS-30188 and LPS-34920