Revert #1775