How to reformat code without optimizing imports in 4.5?

I hit alt-command-l like a fiend.  Prior to 4.5, it would just format the code.  After upgrading, it seems to default to Optimizing Imports as well, which I don't want.  Is there a way to stop alt-command-l from optimizing imports?