Revert redirect code

This removes the redirection + retry code I added during the change over.

What's currently missing is a quick test that the BinaryFile interpretation works correctly for the new methods.

@princke Is this something you could add?