Fix a derp with prev cherry pick