Revert "Fix typo in commit b6d634dd."

This reverts commit d5dbf35c80e4650d851f0e5dfffcfdba5659190f.
Revert "Merge pull request #744 from echampet/bug-10001"

This reverts commit 5178f29c4b3b6c31b88357d9c126af707a27992b, reversing
changes made to fb653dc0ea55de5c7cf51fe3b0006cf094be9b0b.