This reverts commit 88783dd582a77e689ab80b1369f495e08045551c [formerly 07012759]. Former-commit-id: 21775152