Unified link generation in single mapper.
Revert "Unified link generation in single mapper."

This reverts commit f2ddef5b4f469e870ab2df8a3e6e1a8fd45c766a.
Revert "Revert "Unified link generation in single mapper.""

This reverts commit 49d122957a4e2ba4704bf1cee4025d324f4ecb15.