[JES] Just take serve back to what it is in develop for now. I'm guessing the...

[JES] Just take serve back to what it is in develop for now. I'm guessing the conflicting change is in another branch that hasn't been merged yet