Reduced calling on virtual function.  Refs #8169.
Merge branch 'feature/8169_fit_slowdown' into develop