Accidentially lost in quick refactoring in commit fa57c47f. Change-Id: Ic83cf257306efa66a236f2034ffbff3b53579090