Revert "Merge branch 'master' into PicTransferServer"

This reverts commit 5a88f03448e76b86d690987d9b2cb445aa17a274, reversing
changes made to 514b15fffa517ebe18868da69adc4498192ce8be.