restore and inline the old functions now that we don't need to call them twice
restore and inline the old functions now that we don't need to call them twice

artivilla/desktop,kactus-io/kactus,shiftkey/desktop,j-f1/forked-desktop,say25/desktop,say25/desktop,artivilla/desktop,desktop/desktop,say25/desktop,desktop/desktop,shiftkey/desktop,j-f1/forked-desktop,j-f1/forked-desktop,say25/desktop,shiftkey/desktop,desktop/desktop,artivilla/desktop,shiftkey/desktop,kactus-io/kactus,kactus-io/kactus,desktop/desktop,artivilla/desktop,j-f1/forked-desktop,kactus-io/kactus