This reverts commit e5f1d24913. Reason for revert: "Remove account" does nothing and shows no errors Fix: 232819214 Change-Id: I4a4e5084cde87ea2a9e5be1ff3ca6709e11ebc3d
e5f1d24913