Temporary breaking change for Hardy