Partial revert #64 - Vendor files must stay untouched