Bug 943601 - greatly improve configuration bootstrap (only one codepath now)