Revert "Updating files so it can be merged."

This reverts commit 0561944b0c888babfcb364615e1b798b54485eb2.