This patch was applied as part of the broader file ccache fixes included
in 4788.