Log Message:
Backout Official Patch 5.  Some packages have already dealt with removal
of the obsolete "Function" and adding it back in breaks them.

Noted by Takahiro Kambe.