Revert test fix that pointed out JAVA-313