re-add these until after we ship