bugid:96399 - reapplied the fix from 8b1609ba