Revert "Fixes issue where the wrong line gets highlighted"

This reverts commit 3364706262cd426e95a9d787ad906889a26b6919.
Moved fix to template