Back out 755ecb4d6e2c and 7ea09c8bf385 (bug 925962) for bustage
CLOSED TREE