Revert #4687