Revert to orig eric commits