Adding back in server-side code that was deleted when reverting changes in master