Revert "Merge pull request #36 from darnould/Redux18"

This reverts commit ece2249e5ebbf157dc64e2493a215c0ab945ff2a, reversing changes made to a3cdd11d59a1d34bf3d9cf31c96c8a4b05ba634d