Interim update to ToolingAPI for update fix.  It's still not completely fixed, but works slightly better than the previous commit