Revert "Remove fmgr ellision, for now"

This reverts commit 240c3f9da657ab7355e3ccf31fd7078c5358ec1b.
Remove unnecessary defensive measure