Solution is OK but I would like you to add a reference to [bug 968087](https://bugzilla.mozilla.org/show_bug.cgi?id=968087) in a comment as this __clear__ should be consistently addressed when refactoring the start-up process.