This reverts commit 782e6ea4ed. Said fix introduced a crash the moment one goes to edit mode.
782e6ea4ed