Revert some UUID changes for next release. Changes reverted can now be
found at https://github.com/externo6/FactionsTesting