network-uri split off from network
removed regex-tdfa because it conflicted with buildwrapper