From IRC, agreed to put this change off for another PR.