* commit 'e944c06b351701b929146a7817055f91606d8b9f': Partial revert "Add better errors for unresolved attributes, remove unused code"
* commit 'e944c06b351701b929146a7817055f91606d8b9f': Partial revert "Add better errors for unresolved attributes, remove unused code"