Remove dependency on extend from augment