Unintended change reversal
Merge branch 'issue-7-fix' of https://github.com/archshift/citra into issue-7-fix