Add missing commit from botched merge (refs #7289)