Lots of compositing test failures after r167152