Partially revert #2551 #2554

Closed cuihtlauac closed 1 week ago