Backed out changeset 13a54f1eac4f (bug 894701)