Workaround for #8031
Revert "Fix compiler errors due to #8031 -- REVERT THIS COMMIT LATER."

This reverts commit 9fa25661d91bb5519742e1cdb91df29dca6ac231.
Compiles with HEAD
Works on HEAD and 7.6.3, but fails lint on HEAD.

In particular, singling "map" causes the core lint failure. I think
it's related to #8031.