[DF-4453] Rollback some code.