Backout aerosol/vimerl: indentation causes irreconcilable differences