[Fix] Revert #3972 (Fixes #4991)