Closes #2102.