Final change in not using the custom URL.

Whoops. This should have been part of the last commit.