Accomodate upstream changes to history API