I would think the way you have it now is correct.
They wouldn't have it "twisted" around that casting.
Also, that moveable idler bracket, for the spring to pull it "back", it would work better the
way it currently is.
That spring also looks like it needs replacement with that space between the coils.
.