Restore contents of gh-1389.

Merge of gh-1395 caused changes introduced by gh-1389 to be lost.