Merge "Revert "Don't block quick callee saved registers for optimizing.""