revert the previous patch and use the HAVE_UG_PATCH9 again.