Remove indirection

Signed-off-by: Tammer Saleh <tammer@pivotallabs.com>