Thanks to Maarten De Meyer for this patch. BUG: 152156 FIXED-IN: 4.8.4 REVIEW: 104662 (cherry picked from commit 1e6399ee)