reverting AS stub ns2p changes