We've decided to add it back as it works for us. Change-Id: Ifd117154b42792b7683130ea4c01c845495463f4 Related-Bug: #1410471