Commenting out UF/DB code until we've fixed bug #2096