Bug: 12622 Fix scope.
Bug: 12622 Fix history usage that was broken for at least 3 years.
BFN