master_on_bootstrap branch no longer needed.