This reverts ce1b24cc. Since opaque pointers are enabled, we can safely revert the patch now. Opaque ptr cleanup effort (NFC).