Looks like this change will make changePersistLockMode go into a tight loop now... ? (if repeat=true)