I guess nostalgia trumps logic

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #2011 from live627/dev

I guess nostalgia trumps logic