This reverts commit a22ff43fc09b55eeb3ee3aec1526ac0a9edca31f. The behavior is no longer required with the submission of: c1b1d85a93 Change-Id: Ia723f5dbcbd20fda7af4f3d15032db9b63204d67
c1b1d85a93