Revert "[BACKLOG-872] Fixes due to the introduction of the Property type...

Reverts pentaho/pentaho-platform#2168