Fixer-Commit

Builds off the last commit. I guess because these files are in their
original state, I'll commit them to work around this bug.