Revert #1565

I revert #1565 because of #1567