Revert "Revert "dropbox insists on making me commit...""

This reverts commit 628f006e3a2b34136eaa5d473ba264d20f12b655.