Closes #2136.