Revert 2010-10-18 change; use safe-functions instead.