Restored code that Git had somehow deleted.
Merge pull request #2569 from ddobrev/19520

Restored code that Git had somehow deleted