Bug 1009358 - Choose search engine

Let's remove this change too :)