Bug 1022238 - Part 1: Back out bug 1011714. r=margaret
Bug 1022238 - Part 2: Handle removal correctly. r=margaret