'system.mount' workaround not needed anymore