This reverts commit e0c42ea9.

Xena has branched and is almost ready for release.

Change-Id: I9315110fa767ff62681486e436fca5503339cabf