We still need the ability to toggle this feature because it will need to be turned off for "expert mode".