Revert #2