Revert "Merge branch 'Map-js-Modified' into database"

This reverts commit e25df65c7184bb81a7676defe2e672fd9e946060, reversing
changes made to 26389bdf598903b150735051c49c4e13e8ad8840.