Bug 980275 - Bustage fix. CLOSED TREE