Bug 923461 - Clean up the start-up logic. r=gandalf