3ab8d2aa relanded in 31125785, so reland this too. Might want to set this to True (and add a few source files to builtins) at some point, but for now heal the bots.
