Revert "Account constructor messed up"

This reverts commit 6a6d1b59d9dd36e7d67c811d1df68cf36cf0fde3.