Backout 3e7970330a3e for being wrong
Backout 5e84af960621 for being wrong
Finish backout of part of bug 856472