Fix for Fix for MODCLUSTER-432.