Regression fix : Revert #3776

It seems to make BOF3 unhappy , revert it for this time being until find a better approach .