This was not supposed to be merged yet, it breaks grenade.
There needs to be a fix applied to master and then included in this backport.
This reverts commit f61ca5fd61.
Change-Id: I6321039117dcff80bb87e43f0e49082071018936
34 KiB
34 KiB