Merge pull request #13227 from BruceForstall/Revert13186
authorPat Gavlin <pgavlin@gmail.com>
Sat, 5 Aug 2017 02:00:48 +0000 (19:00 -0700)
committerGitHub <noreply@github.com>
Sat, 5 Aug 2017 02:00:48 +0000 (19:00 -0700)
Revert "Fixes issue #13093"


Trivial merge