This reverts commit f9f0a25b26. Reason for revert: <INSERT REASONING HERE> Change-Id: I32657e10fa8ff58dd351aa8e0b611195c2826f07
f9f0a25b26