Reinstate addition of models revereted in c00265489113e8b3055cc2acacd23aa5fb534a92 and 62e0e5bd35e0d6e9c28b839f767dfae6f2612c8a.