Remove Cherry-pick derp