Take 2

Change-Id: Ia850899124b6a5a410f47c9a716eb929ee6866d6