Remove unneeded bits of commit 2013-02-15T09:41:31Z!eliz@gnu.org merged from release...