Revert "Merge branch 'data-feed'"

This reverts commit 5ff0b38b50d0556ddb514d7931ee66fd8670ebff, reversing
changes made to dcb0183edfdedb8cc14dad28f86be225440df3d7.