https://issues.apache.org/jira/browse/AMQ-5402

Revert the changes here as the mapping is moving in a different
direction.

4881a848dc9c8170ab82267a6bdedd4d3adcc372