Fix-up for fee38d2

Change-Id: If3a338bbaaa303edd541480b64c43526e9f5fe32