Revert "1.165-maps"

This reverts commit 3a82bb10a27bac58afeafb5aee26d02c1cde199d.
1.166