Reverted XStream 1.4.7 -> 1.2.2