revert highlight.php changes (bug 47112)

The recent changes made to highlight.php introduce some regressions
which need to be removed.  See bug for details.

Change-Id: Idcec674abd2df9f43eb60aae4d248c57243af363