Do we really want to remove this?