Restore guard to populateHistory, fixes #8767 #8768

Merged
merged 1 commit into from May 9, 2017