Feedback from @StrawsonDesign. There's likely something this breaks, but this change will trigger finding out what that is.