Revert "Merge pull request #993 from phire/fix_getOpInfo"

This reverts commit a8f724e7c2a920549ca1770c083f45abec8e0ec9, reversing
changes made to 7a1eca149fe2cba0ffc874297565a04c4f7f4675.

For why I'm reverting this entirely, see pull request 997.
Merge pull request #1005 from comex/revert-993

Revert "Merge pull request #993 from phire/fix_getOpInfo"