Revert "Changes for XenonHD"

This reverts commit 82deb8074d19607c9a820346b75d901451309925.