reverting fcv guard
@bug W-2439103@
Merge branch 'dval/master-pending-revert-fcv-guard'