Removes code that uses forward_as
#3357
+63
−65
Merged
forward_as
#3357