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

This reverts commit 03bfa87efb32fc4cd0c4f9723ed087a9a5b46049.
Revert "[BACKLOG-872] Fixes due to the introduction of the Property type in"

This reverts commit a78e9b499a74b2b73a2a8861bf27061c708cbaf8.
Revert "[BACKLOG-872] Restructure Data Access to allow for deterministic build"

This reverts commit 9daa4e884ee90a163cbb1ca52b3857f0bb47f00e.