Non-commutative factoring.

I'm playing around with some noncommuting operator expressions and am
trying to simplify them.  Consider the following test:

(%i1) (A+B)^^2;
                                         <2>
(%o1)                             (B + A)
(%i2) expand(%);
                                   <2>            <2>
(%o2)                     B . A + B    + A . B + A
(%i3) factor(%);
                                   <2>            <2>
(%o3)                     B . A + B    + A . B + A

Can I get back to the original form in %o1?

David