Revert jhughes commits.
8 files changed