Revert "[Fix] After merge"

This reverts commit 3cc2b26dc25d04ff84d35400a87c33e41e43c108.