At the moment, I think I agree with @Guillaume , I would leave the output as it and describe in the doc that ES 2.4 and 5 ahve a bug and that this object cannot be indexed
Also make it a FAQ