Resurrected my old inherited-properties patch