This reverts commit eb79fd3c. This causes stage2 crashes, possibly due to StringMap being miscompiled. Reverting for now.