Bug 8228 - metadata service fix made cleaner

No match.