backout 1c865eaf5dd8 for red/orange tests