Use preferred GNU mirror, restore bottle block