reverted map support changes