Nice to see this going away. The ES serializer is much nicer.