Tweak so this doesn't require any changes in Core.