This reverts commit 172b23af33. (cherry picked from commit d0d2d4c51e9534e08893ae14cf3fff7b2ee70b1d)
172b23af33