Restore upstream for vim hardmode