This reverts commit fe7f088a. Reason for revert: Seems to be causing boot failures (b/144864188) Change-Id: I672639a1f7a41c7c4b75d21e9ff048a8691f06fb