PRD-4978: Revert changes to make PRD compile and run under JDK 1.6