Make it even more plain

Change-Id: Ib29cc4a6f6b4eb16cddffcec88f6994dc62c9653