revert to the old solution for history guru tests to pass