Fix fba52fc5161a, bug 813906, test bustage.