Revert "(hopefully) fix exit from CMAccount setup"

This reverts commit ce4f4c3d9e5daca774b4fd2360b6ac0dfb6b9a3e.