Disable internal ACF (temp fix?)
Merge branch 'refs/heads/gideon'

* refs/heads/gideon:
  Disable internal ACF (temp fix?)
Undo disabling of internal ACF