consistently use same code path for umounting