#61433 by bozo, fix some logic around the GUID addition.
#61433 by bozo, fix some logic around the GUID addition.

OccupyWallStreet/streetnet,joshkoenig/golden-god-demo,lincgr/Prueba,OccupyWallStreet/streetnet,lincgr/Prueba,edutrul/social-web,rmcveigh/frontend-dev,lincgr/Prueba,OccupyWallStreet/streetnet,rmcveigh/frontend-dev,brainhell/drupalglass,joshkoenig/golden-god-demo,brainhell/drupalglass,brainhell/drupalglass,edutrul/social-web,edutrul/social-web,brainhell/drupalglass,OccupyWallStreet/streetnet,joshkoenig/golden-god-demo,joshkoenig/golden-god-demo,joshkoenig/golden-god-demo,joshkoenig/golden-god-demo,brainhell/drupalglass,rmcveigh/frontend-dev,joshkoenig/golden-god-demo,edutrul/social-web,lincgr/Prueba,edutrul/social-web