This reverts commit 8dce1c1e. Reason for revert: disabling was temporary Change-Id: Iaf78952b28144c17cd62f16f7e52e71a32b8084f (cherry picked from commit ef8c3d45) Merged-In: Iaf78952b28144c17cd62f16f7e52e71a32b8084f