Revert "Url aut hacks"

This reverts commit bbe14dd81309574eab0f56d875d5231d85f6ff13.
Better aut.ced hacks