closes #6671

No rush on this