... after eca4c54e - not sure if it's
correct but at least it builds for me.

Change-Id: I36083fac98c830560cdc799923d309f96e8cdd6d