Looks like this will make things a lot easier. Microsoft is waiving the 90 day “waiting” period for reassigning licenses to another server. This brief explains the new terms, lists eligible server licenses, and provides answers to frequently asked questions.
Today, they release two different docs to help explain it.
Download: Application Server License Mobility