Fix a cherry pick. Had wrong code and was double-cherry-picking one change.