Revert windows template changes.

For some reason we are seeing intermitten issues. This is a revert since testing shows this order works as expected.