Revert "#330 - REFACTOR: Improve properties and descriptors logic"

This reverts commit c155025e752c82ebefb5dee6c3a6ac7bf50abed5.