This reverts commit de37e7ae4808dc9cdd84a8c21411958ed51db56.
This should now be properly fixed with a2185987.

nitpick: That commit was refering to a wrong commit anyway, it should
have refered to a2185987d instead.

Change-Id: Ic46db94568ac4074f471f42678cdf8d9fb32ef67