This patch fixes the regression caused by 07483564 where only the linux plugin was handling this scenario correctly. Bug 6332