Refactor to remove conditional

Change-Id: Ibe9364e6c1a1a4002f88999ecf4d8b318254d566