Merge "Revert "Update RTD to use custom trigger url""