This is a leftover of refactoring in: I99f78abd42. Change-Id: Iaad4de5df6269de7258629712b4ee9d3951455f0