Revert "Merge branch 'DataMap-extends-Library'"

This reverts commit 8fde3a15dd01da0d2681277b9b0480dff31a075d, reversing
changes made to a810a82aed0768cf13ea933650859fb998b18777.