This reverts commit 47b9d0d040. And implement a fix that doesn't require Depsgraph refresh.
47b9d0d040