Revert "Merge remote-tracking branch 'upstream/master' into configurable_owncloud_temp_dir"

This reverts commit 2f08e7e669389fca749e9a1de9e6fbd3796df546, reversing
changes made to 59930fcdbf6d600239f7da5cdfc7c12def4830ea.