CFY-1574 restore immutable properties