Avoid kernel changes in AssignmentManager and HMaster