I'm actually going through the same process as you, but after chrome's change to default auto-login, it was the first thing I changed.
You might want to consider the same.