Revert "workaround for null Parent"

This reverts commit e8c99c74113e269b7388faa58bfc6fe70fd93203.