revert #374