Fix revert botch in 61c43594d34acf.
Merge pull request #1824 from kmaglione/fix-merge-botch

Fix revert botch in 61c43594d34acf.