revert changes to shim.

The shim can't have any external dependencies.
Correct comment. Keep in sync with exitcodes.py