Remove unused indirection (#11192)

Change-Id: I6c0d2342b29b79d224dfb2d1f42eb9d95a589981