this wrapper is unnecessary and fragile
Merge pull request #1036 from ddollar/remove-account-stub

this wrapper is unnecessary and fragile