Remove AAAA for ns0/1/2

Pushed back for next week. Plus, let's think about it some more and ran tests from multiple vantage points.

This reverts commit 798a62910185771ef0e7d74137ddfafdd666b93d.

Change-Id: I6044bbc5cb406947d2ab1e60a4a66adc56af242e