This reverts commit e2dd47bf42. This reverts commit 60b1951f90. renderdiff test breakage
e2dd47bf42
60b1951f90