reverting the convenient url changes to be in sync with clement's master. maintenance headache.