This reverts commit c2b185def846f5577a130003a533b9c377b58fab. (cherry picked from commit 32b43304563c2430c00bc3e142a962d2bc5f4d58)