Revert #2957