Revert "Merge pull request #33 from darnould/Redux15"

This reverts commit 66f8a9855b7b306fb6f1cf63d8f8e62479c7d621, reversing changes made to 43ddb59ccf31927b045d74923174d0ad45bab8b6