Reverted 1a1fe6d50802713d969ed08d6fa06dec53cf90e9 to make things workproperly on java5/windows