Also fixed some errant tabs that had crept into one file. (cherry picked from commit dc219909)
Attach a file by drag & drop or click to upload
