Revert "Merge pull request #13097 from dmarcos/bug928614"

This reverts commit 4c652c5ca43f301217cbabf8f781b93a860bec37, reversing
changes made to afbf45f26a73b7cd5e0a831bea48087331975286.