Revert "Translate done in computeLayout"

This reverts commit 8f1801529f08dc7e056c2b44c60a843cd1cc6987.
Inline pointMapper