Move the non-configuration settings to experimental header