Conform to new core changes.