Revert to upstream
Quick scratchpad in vim