The patch ensures that the file browse model can only get removed in one
place, so it's easier to clean up.