Fitzroy or Armadale?

I've just seen this pic on the Stonnington Council site. It says the photo is from 1984 and the sign is in Armadale (http://stonlib.stonnington.vic.gov.au/cgi-bin/spydus.exe/FULL/PIC/BIBENQ/51260756/6396913,45?FMT=IMG):

But it looked strangely familiar to me. So I looked on my blog, and found this 2012 pic from North Fitzroy, just off Brunswick Street:

Sign is the same, windows are the same...hmm...