This commit to 5.x-3.x might have to be forward-ported:

http://drupalcode.org/project/drupalvb.git/commit/b64fb69d8a85a4326c61d7...