Revert "pushing changes to merge-datalayer branch"

This reverts commit b8050c95c93360695da0b5abc99d1b3b1d5f8a93.