Fixed bad cherrypick from another branch