Fix overwrite
Fix again
Revert fedf24c..2532089

This rolls back to commit fedf24c547f328686e73cc69268f4646edec97ae.