simplifying to try to make things work

Change-Id: Icd57507eeb64159c50515721724d8892264921bc