revert rev 735101 in trunk see comments on GERONIMO-4519