Moved the optimization in the previous commit one level up