revert changes from duvall

Change-Id: I9161bab083f3f49ba2b9093d2a37cfbec1ae3286