Revert "Merge pull request #34 from darnould/Redux16"

This reverts commit ee5402b98f7110465684e3176e92065d0288fa64, reversing changes made to 928ea8a39a2aa9db032870ec69d1583717c58d93