Revert "Merge pull request #38 from darnould/Redux20"

This reverts commit ec7965f42edc97bfb1b876c45f8a739ec8b2c03d, reversing changes made to 4c285db7db9e29448c9b03f6f29f13c98a5a57e9