Remove comments prior to the fix (JAVA-402)