backout 9ee8634f70dc because it didn't work
backout 4bc6027f5638 for causing bug 978741