Reverted serializers to match open source version