Remove the ONF requirement.