Actually use tmp for something (brings trunk back into sync with 1.6 branches).