Modified registry fix to not initialize collections (was change in behavior).