Minor simplification

Change-Id: I031409043f12bdfe4b8c838d74db8a60576fd507