Partially revert 95c562f9abaef182b5c097dda025cb1b2d30aac4