Fix derp from cherry-pick