Revert "Fixed UUID string issue"

This reverts commit be94b039508ea47dcd1805cdd669cd974ab6e100.
Fixing messed up merge from dev-MK
Learning how to revert... whoops

Revert "Revert "Fixed UUID string issue""

This reverts commit 9fb36e91b1b75e3bbea86f9eb654b60419cca127.
Keep shell.py configured for offline use