This reverts commit e70f5bcce39ae19060be62aec8b75f75c26d1b9e.
(cherry picked from commit 02c1de55c4b21863bb7500811e04bc0de9177089)