Restored changes from when Dropbox farted