Start to revert to previous way of handling rules + diagrams