Revert Eric's "heoipnfoiew" commit. All the files should be restored

This reverts commit def7d4b7956a033fde0634af0b287374a374fcd5.