Link editor displays raw Velocity code after applying security patch

After applying the patches from 2010-05-04 security advisory, the search box in link editor spits code:

$generalUtil.escapeXml($!searchQuery.queryString)

To reproduce, just open the link editor while editing a page.

This is due to the included patch WEB-INF\classes\com\atlassian\confluence\util\GeneralUtil.class

Problem does not exist in patch for 3.x.