Fix 2.1 branch for JAVA-393.