Merge pull request #1005 from comex/revert-993 Revert "Merge pull request #993 from phire/fix_getOpInfo"
