Revert "Merge branch 'PicTransferServer'"

This reverts commit 9ed3d5542f27ef5f2202bf4e44116b9bee535e7e, reversing
changes made to 5d1b922fa1ba5a44139ebdb8c818298fb84313e0.