Revert "Update AccountManager(Impl) with collection API"

This reverts commit 0c3fb7b103380e1289de25a3d9edeef5ea7faf79.
Revert "Revert "Update AccountManager(Impl) with collection API""

This reverts commit 98868859c36453d7fca62ddc9c0faaa87b7c291d.
fuck it
double fuck it
fixing merge bug