Fix previous commit (extensions part, second)

Change-Id: Iac6c801478a583346c8358456b788a0085158981