Reland r206934 with a hopefully fixed test