Revert "Revert "Revert "Revert "Optimize to the max""""

This reverts commit c208dd0c58f13e531c8d27728539d5b4d9f9705f.