Merge "Remove dependency on deleted adaptor"