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