Closes #2261.