Restore old UA numbering; sync Windows version with other builds

This reverts commit c685b797d1baf119483cb7ebf752d8dfa8db86aa.