Fix bustage due to bug 984980