This reverts commit 54d9e8c6, which
caused a failure on the buildfarm.  Not a good thing to have just before
a beta release.