backout 31639a8b181b for causing bug 978741