Bustage fix for bug 1059479, CLOSED TREE