Just to be a bit pedantic wasn't the ATC tower and control always in the original terminal building right up until the new one was opened?
The tower in the current terminal was used purely for apron/ground movements until expansion of the terminal rendered it obsolete.
You are right of course rollo but it looked like a ATC Tower so in my eyes will always be a ATC Tower