Revert "Fix compilation after rild updates"

This reverts commit 6acc8756c0f8c1f16afe10d3dcd5f8ba50389fce.