Issue375

These are pcworld's changes without the submodules and without the enyo upgrade.
Let's break the impasse and just fix the issue.