Revert "Clean call-jack and its callers"

This reverts commit 4c1fc77c2e8453082601ed8209aaaf5e433bb2f4.

Change-Id: I4f5e3ec1e6fea66f315a9411db17de257817dcc9
8 files changed