We're getting cold feet on this one... let's put it back. This reverts commit 210331d9. Change-Id: I6b0d3c2b1dbf7f1dc9566979a91b7504c2189269 (cherry picked from commit 6a918870)