HDFS-5642: clean up conditional compilation.