There has been a ton of fall out from this change, and I think it's been premature. We should revert and try again when more of the client space supports this. This reverts commit a29434460e. Change-Id: I1658dc48a024627be0fdb39c46137aaa3d9b911a
a29434460e