Closes gh-1664.