Revert "fw a/v to us"

This reverts commit f03c823c806b735166a167468c4a2237d7bba23e.