Back out bug 896711 for potentially causing metro test timeouts, CLOSED TREE