Hack EOF logic for end-to-end transfers

Hopefully this is only a temporary fix.