Putting on hold the fix for: Problems with ClassCast Exception -
TRUNK-4053