Fix bustage due to bug 1061247