Revert a requirement file, and remove a unneeded line from test/helper.
Merge pull request #1380 from namusyaka/revert-requirement-file

Revert a requirement file, and remove a unneeded line from test/helper.