Change-Id: I68168a387c088b45e2572d5c982d33dfe0aa38a8
This involves reverting dd267e8fc3, but that gets lost in the move. This builds on Ubuntu and Windows at this time.
dd267e8fc3