fixed some deletions from cherry-pick