Remove #97 as 'optimistic data' support has been committed a while ago