Updated to remove certain features that don't work well on the Linux
console.