Revert "updating reportxform mapping"

This reverts commit d73b759ce82c5f3d16218fe7d766fa4425d3f0f6.
adding more fleshed out nested case