Change-Id: I8ccb7be448faf42904eb6246a4f5a06ff8028ffc
This reverts commit 3d75a28274b2fb299c5a2ff5b017984054cac873. This will be pused again _after_ feature/soenv2 is merged