A little simpler.

Change-Id: I684317003a7afee4154fe39098ced7ba27bdff2f