Eric - 2011-09-01

Workaround committed to SVN.

Awaiting resolution from IBM.