Cleanup of zenx2's pull request

I removed the second commit that said "merging from upstream", but wasn't really merging anything. Not sure what that one was supposed to do.