Fix handling of backwards compatibility - broken in AOSP too?