Revert some optimizatons and configs