Revert redirect patch

Sorry, I've just realized that the "--broken" option already did what my patch did.