Revert PR #490
Created by: bjackman
https://github.com/ARM-software/lisa/pull/490 was basically nonsense, I merged it in a rush. Revert its contents. One of the commits does sort of make sense but it's debatable, let's delay it until a need arises again.