Avoid using with-historical routinely

Allow clients to choose whether to use with-historical on a case-by-case basis.