Revert "caffe commit"

This reverts commit 5938083c2adb76f56c03ab57aed373f6f622fe58.