Revert for now

This reverts commit 7ee8050be61d40aa3dea75f44c73b97dbfb1f7f0.

Change-Id: I73a1b10d17d85b1eb36dd598676b2a3e1e3aa958
Merge "Revert for now" into pac-4.4