Revert "Make global sql work"

This reverts commit 824447599ce58fd22152caad204f176f78c30855.

Change-Id: I4d5f174476e6a7fc1fd22a39c588f655f407f839
Revert "Fix global tsp by generating it like the others"

This reverts commit 8811df1ac38ec668697dad396bc271a800bb6d4c.

Change-Id: Ie1711eec8915c4ff2577fc0e300ae87f850ebf0f
Merge "Revert "Fix global tsp by generating it like the others""