Revert "[BUGFIX] Fix an issue with concatenatedProperties."

This caused some regressions and will be fixed correctly soon.

This reverts commit 8f5356d1513e334a6d29c9d97541eda97a39d635.