Updated to rebased core branch
Temporarily use the renamed but deprecated _url() function.