Revert "Change ondemand to ElementalX gov (but keep it named ondemand for compat with HTC stuff)"

This reverts commit 456f0e3b1dd4177f0c13af03db55b58a6033c0e4.