-revert of address_bw addition