Revert "FIX_URL_SCHEME redundant if we need external_url"

This reverts commit c38b049caa11b3d89064e92ef8ca87c23703dee4.
Fix external URLs