Unwedge the build, broken by changes in 0c1ef953.