Revert to 'old' way of dealing with assets + diagrams