Fix cherry-pick derp