Revert "Merge pull request #300 from rwaldron/290"

This reverts commit b955373ddb472002876efe8abddc7236205b481f, reversing
changes made to 27a0cfa7b963b5fb76c5123e72cce73ec8227d9b.