Revert "Fix FC when PAC is disabled"

This reverts commit 55eebd9145ea217cf5a924ba661ee743d52797b1.