50th Anniversary Scared Straight Sketch Short Shorts

Does anyone else think Will Ferrell wearing those short shorts in the 50th anniversary Scared Straight sketch was a nod to the famous "Short Shorts For the USA" sketch from 2001? When he came out that's what I immediatly thought of, but was wondering if anyone else felt the same.