Back out ed6e04e6fc0c (bug 968642) for breaking Windows plugin tests
CLOSED TREE