This reverts commit 01dbb084.

I must have had something really wrong going on in scratchbox for this
commit to fix things.