Remove Bug 7068 work around.
Merge pull request #875 from Safety0ff/nomo7068

Remove Bug 7068 work around.