Attempt to fix the problem with failing distcheck.

Attempts to fix the problem with failing distcheck without reverting bec2ee7.