Revert "Fix a lint error."

This reverts commit f7b63f2ed5f8fea7ed9c8d5b9116bc10bfbab7b7.
Revert "Auto upcast of pointer parameters to C++ routines."

This reverts commit 64cc5c47bed294d5efa2433655552530c0242503.