This reverts commit6271f5cbe5. The original commit15094eb03awas reverted because it caused a problem during bootstrap. That problem is fixed in a subsequent commit.
This reverts commit6271f5cbe5. The original commit15094eb03awas reverted because it caused a problem during bootstrap. That problem is fixed in a subsequent commit.