Revert "Avoid potential error"

This reverts commit aa2780f6cea2ec665fb87653c7cc7c605642ea21.