Remove identity_future indirection
#104833
+145
−357
Merged