Revert r34877 -- duplicates wfExpandUrl()