Re-enable the forwarding feature

for #1591