Revert "[bug 966978] Add support for FxMetro in AAQ."

This reverts commit eb479285dda93dba5104fe2a7356e340ff83661f.