Revert "Merge pull request #132 from sviridov/undercover"

This reverts commit d52ccf10d4d261c6ee90c0b6a19b82173c19f3cd, reversing
changes made to a2db2d41d5978ac169d68a59bc1fab1283b40976.