Simplify.

Change-Id: Ibbaf20abd2cb4f2b9ef0014969db827ccffa0c0d