Re-added RF support.