bug #2973949 SQL History broken (need to revert patch #2899969)