Revert "Optimize to the max"

This reverts commit 53fda3d9bdf2d86a324fcc08a22d1af5438f3382.