Continue aligning ourselves against the official SDK.