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