INT-3381: Revert `RouterFB` & `SplitterFB`