Revert "Merge branch 'master' of https://github.com/Xcaliburne/Nintendo"

This reverts commit c72c9f73341de9c4e6dd0d0bca1e52356134443a, reversing
changes made to edea82f404cd1a47461a0678bea8aacfdea32184.