This ought to be obsolete in 1.1. The Trivial Script should be able to switch them around for you.