0856579cac
This reverts commitb8a173b25c, reversing changes made to5de090464f. (I applied this pull request when I should not have done so, and am now immediately reverting it.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org>