Fix errors specific to 2.11

Seems like we are hitting `resetLocalAttrs` very hard, and it needs to be fixed for our usecases.

For now I'm using hack to still be able to use `resetAllAttrs`.