Backout ccb5d3df67 / incomplete bug 976614 leaving just what is required for about: uris