We actually need this upstream feature, but we found it has another bug (lp bug: 1793102), so revert it first. This reverts commit 7b60534ce8d2da45debedf9bf3f7903dbebade43. Change-Id: I8d8a755e250d4d80e269c853a9d3d97c3f364d40