Revert ChangeLogs.
Fix a crasher.
Remove the first approach to this patch which only worked for file URLs.