Fix merge problem

Fix problem when 7_1_X was merged into 7_1_THREADED_X.
There was a conflict and some necessary changes were
not merged. This is causing compilation to fail in
7_1_THREADED_X.
Merge pull request #2548 from wddgit/fixMergeProblem

Fix merge problem