BUG FIX for arbitrary instance of branched core

Forgot to apply the patch, so the files never changed. No wonder
our rebase was passing tests...