This reverts commit 151496a4. That commit breaks bootstrap builds due to a cyclic dependency.
Attach a file by drag & drop or click to upload
