Revert "Update to 3b470f56b479f618b7e90577f9857b4e25b38c1a"

This reverts commit 04f21656a55bdb0cc0212fdb5439cd3ca900785a.
This was done wrongly on master. Should be done on upstream branch

Change-Id: I10141b34435500b4843fe5a16c9975f40817f840