Reverting last 3 commits - optimization not working