Backed out changeset e09e6815a873 (bug 928214) for crashing Settings app