it seems to be causing unit-test and build failures

This reverts commit 5cbb51c0.

Change-Id: Idc6372f98200b23828aa19b22a75b6b2b640d1ab