tracker-writeback: Revert 3ff16879, sort of
tracker-writeback: Revert 3ff16879, sort of

This patch was blindly cherry-picked from writeback-refactor-0.10
to master, meanwhile Jürg had already fixed it in commit 7504d0a2

outofbits/tracker,outofbits/tracker,outofbits/tracker,outofbits/tracker,outofbits/tracker,hoheinzollern/tracker,hoheinzollern/tracker,hoheinzollern/tracker,hoheinzollern/tracker,hoheinzollern/tracker,outofbits/tracker,hoheinzollern/tracker,outofbits/tracker,hoheinzollern/tracker