91eff55c8c
This reverts commit 30d26a4fd2.
Some issues in this patch were identified, see T52599.
Reverting so that MLEB can be released and issues fixed and
tested properly after the release.
Change-Id: I35c1eb2db5ead8ca75dc2724997d789c83c69b6d