Do a better job at removing tabs code.

This fixes some bugs that I introduced a couple of hours ago in
https://android-git.corp.google.com/g/#change,26299. Mainly, edit didn't
work.

Change-Id: I8484a454ce1e5866d981000f97959a3534ea12f2