Revert "experimental single overlay for maps"

This reverts commit 74b7b59e0eac6ec09c032baa6e9d9d27f0ec2f95 which
had been merged by mistake.