fix/rollback for issue with experimental settings thing