Revert "Fixing issue #181." This should never have been in this branch.

This reverts commit 39116bfeac5843db704b175736caaacf5b8f450c.