Triage patch to do some control on the ubuntu issues.  Dont use this until fixed