This closes #2902