added the p2shAllowed flag back in, amidst some confusion