[MAP] Re-adds changes to Syndicate Base

-Approved in #4630
-Likely inadvertently reverted in #4716