Undo refactoring since that was causing issues with jsonpickle