Revert "Experiment with display template in diff order"

This reverts commit e0cb49e1bc155a07636ae69c667d94a8bad122a0.
Experimenting with changing display template order