Take 2

Change-Id: If91c2743faa57e484de96817c8613870ab1911ef