reverted to takes() and returns() on RepositoryServices