Fix derp for facebook hack merge