This reverts commit 2524ec42.

Reason for revert: I don't think we need it anymore

Change-Id: I9f2871cf3de1a09952fc5c236da2f78e4d930bf5