In the past we've made it secondary, but I think it was because the primary test wasn't as reliable as it is here. I'd keep the metadata server check as a secondary test for now.