Bustage fix for bug 852648, v2. CLOSED TREE