Re-add bootstrap build to avoir BC break.