This reverts commit 2bcb3fe567. Reason for revert: this is a good change, just needed more work to not break CI Change-Id: I23768bee242e3cf81b1493a740cf070e7ad1e224
2bcb3fe567