This reverts commit cdc59e22. The Verifier finds a problem in a stage2 build. Reverting so Bruno can investigate.