Backport fix to call mount a single time