Bug 984677 - Back out bookmark submenu. r=mfinkle a=sylvestre