Backed out changeset d155557b651c (bug 888323) for bustage.
CLOSED TREE