Backed out changeset db16370f7cce
Back out bug 919457 for build bustage. r=me