Fix previous commit (extensions part)

Change-Id: I942cca3639e4d823415da557262e35432a798d04