Revert "Merge branch 'landscape-data-bindings' into 'master'"

This reverts merge request !4500 (merged)

As master is still on .49 embargo and new features aren't supposed to happen.