Backout b8a5df436404 (Bug 910563) for b-c failures