Backed out changeset 9c4c4356afce (bug 966646) for causing bug 1014458