This reverts commit 355f0df8fd. Bug: 297270938 Merged-In: I3b15b35df4bc40716d0aa757a226c5075c7e29ff Change-Id: I44cbb1a0ea6248fbc5a4dc3c12e96d2b66a32282
355f0df8fd