Bugfix for reverse routing when using F.Option (2.3.x backport)

Backports #3533 to 2.3.x