This reverts commit b8a173b2, reversing
changes made to 5de09046.

(I applied this pull request when I should not have done so, and
am now immediately reverting it.)
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>