fix import declaration
Merge pull request #2310 from 9rnsr/fix12359

fix import declaration
Revert "Merge pull request #1827 from WalterBright/add-opCmp"

This reverts commit dab1796ad6966f28c0d220678423718d4d64f92f, reversing
changes made to 327085b8fed061853b0a9c8bdc42df9e495d0315.
Merge pull request #2313 from 9rnsr/fix13074

Supplemental fix for issue 13074 - Revert "Merge pull request #1827 from WalterBright/add-opCmp"