Closes #2617.