reverting POJO inheritance support patch 
2 files changed