Fix error accidentally brought in when cherry-picking
Fix error accidentally brought in when cherry-picking

VoltDB/voltdb,VoltDB/voltdb,VoltDB/voltdb,VoltDB/voltdb,VoltDB/voltdb,VoltDB/voltdb,VoltDB/voltdb