Take II

Change-Id: I087ac516fd53dc8f66eeb07a173d044af6c8cbdd