Apply patch from thomas.kear@gmail.com FIXED-IN: 4.8.1 BUG: 280026 CCMAIL: thomas.kear@gmail.com (cherry picked from commit d6eac430)