Addendum patch for HDFS-7172. Contributed by Chris Nauroth.