Removed workaround, new enough EOF is required.