This reverts commit bc6e091004. This commit was needed to avoid bootstraping, now we can revert it
bc6e091004