Revert "Merge pull request #13230 from fbukevin/issue929377"

This reverts commit cca35de2ff8993be019b3da889bac406915cc212, reversing
changes made to 31687ef383bc1b85a9d388fb3dde610ab7e8f8fd.