Bug 1059625 - Bustage fix.