Temporary FormulaDialog override. [887]
Adding Rick's FormulaDialog changes. [887]