This reverts commit a82001b1, reversing
changes made to f6d870f7.

This commit breaks windows builds and needs some work to fix those and
some additional comments.

Change-Id: Ic0b0228e36704b127e5e399ce59db26182cfffe7