Revert "Merge pull request #22 from Nolux/dev-pc-Nolux"

This reverts commit f2be0600bdadbd563c1ae64a24881de7238cbbde, reversing
changes made to 5198c39daa5d05acd36f330e4b89cb2b6935af0b.