Revert "added our code to the files"

This reverts commit 24d28420fd418b846c31e73180de2a2ceeabdaa6.

Revert is necessary because the files were overwritten by the old
supplied files.
added v6 changes