Back out changeset b6336ba796d4 until fix for #13303.
1 file changed