Revert #1769
Revert #1769