Follow-up to ce8059e00cd6ae0368de8251cf785ef758def817, fixing ProjectBaseModel for good, refs #586