Reinserted patch 1.279 (was lost in move to filetree.c)