Revert "Merge pull request #8 from wmaddisn/wayne2013.12.14"

This reverts commit 48925be6dbf5529d865d47b1b075760ba813fe58, reversing
changes made to a4cca9d44d5673b512f4a35d549334f760fdf462.