Refs #20678 - Backward compatibility