Reverted to previous revision, because 304 accidentally included some EBI-specific stuff