Restore backward compatibility of ServiceResolver, fixes #32