A smaller version than the original remove ivory-data PR.