Revert #4