Revert "Replacing some files with clean, new versions"

This reverts commit 739918b47120b16351dd06db7764713079bf9972.
Revert "Replacing some files with clean, new versions"

This reverts commit 9239d6b175656e0302a0a737e45ce353972aafdf.