Partial revert of 9cbd17b604c05ce928603920be9438c26db78d9d to reinstate logview