Fix derp on cherry-pick