Speculatively disable Dan's commits 143177 and 143179 to see if