Backed out changeset f76156665656, 5a056faa9b62 (bug 876871) for causing vertical scrollbar in the nav-bar