Partially revert commit 69667ede74902f263f98638862883032e8a28a5f
- Changed the storage of local optima