I addresses that in the commit notes for the change that does this: https://github.com/VictorLowther/core/commit/d2d7f708af6e5cf971c813f9e0451658d1a7d290