Revert last 2 changes.

git-svn-id: https://plugins.svn.wordpress.org/contact-form-7/trunk@928665 b8457f37-d9ea-0310-8a92-e5e31aec5664