Reapply b148362d285ebd62520308e264061ee86efad6d5 - was blocking on a compiler release.