Revert "[FIX] reapplied ea1ad32b81e38844a36904bc50546f3142d84922"

This reverts commit 8120b21ed918854bac3eb4a12a87d57240523318.