Log Message:
Revert previous upgrade to 20150422 sources, and just use the sources
from 20150206

When there's a clear consensus for the new acronyms being wanted, this
package can be updated.  Until then, it stays on 20150206.  As agreed
with the PMC.