diff --git a/account.go b/account.go
index dff15e3..659efa5 100644
--- a/account.go
+++ b/account.go
@@ -28,10 +28,6 @@ import (
 	"path/filepath"
 )
 
-// MarkAddressForAccount marks an address as belonging to an account.
-func MarkAddressForAccount(address, account string) {
-}
-
 // Account is a structure containing all the components for a
 // complete wallet.  It contains the Armory-style wallet (to store
 // addresses and keys), and tx and utxo stores, and a mutex to prevent
diff --git a/acctmgr.go b/acctmgr.go
index b25b05a..478ea8a 100644
--- a/acctmgr.go
+++ b/acctmgr.go
@@ -225,11 +225,6 @@ func openSavedAccount(name string, cfg *config) (*Account, error) {
 		}
 	}
 
-	// Mark all active payment addresses as belonging to this account.
-	for addr := range a.ActivePaymentAddresses() {
-		MarkAddressForAccount(addr, name)
-	}
-
 	return a, finalErr
 }
 
diff --git a/createtx.go b/createtx.go
index e4e3c97..78358ad 100644
--- a/createtx.go
+++ b/createtx.go
@@ -218,7 +218,7 @@ func (a *Account) txToPairs(pairs map[string]int64, minconf int) (*CreatedTx, er
 				}
 
 				// Mark change address as belonging to this account.
-				MarkAddressForAccount(changeAddr.EncodeAddress(), a.Name())
+				AcctMgr.MarkAddressForAccount(changeAddr, a)
 			}
 
 			// Spend change.