Partially revert 1cbace10baf41f8dbe524f72fba9e4a4bf909ec2