Issue #3098427 by hchonov, amateescu, Meenakshi.g, daffie, alexpott: Manipulating the revision metadata keys before running the BC layer breaks the BC layer (cherry picked from commit dd939b10)