Needless indirection

Change-Id: Idf514941f4bb05834d8ac0d7bafbe86e34377611