Revert RawView/SimpleView and ModelAndView changes