Duplicate forwards must be allowed, revert for #6212

Revert #6212 (closed)