"The terrorists won when we had to take off our shoes to pass though security."
Correct. All the more reason to have Global Entry even though it doesn't make a difference in SXM on your return. But if they make the changed discussed earlier it might work there too.