Reverting to mozilla way