We can provide the skipRstl=true option to these classes to still obtain the collection level lock and the global lock without the RSTL. We can then easily migrate these cases to use intent registration