fix from trunk: don't re-use mountpoints