Brown paper bag fix for 7909d4c

Change-Id: Ib105cdd9e8f4433781cad5d3eb3279abcfe50a4b