Patch to use raw functions.

--