This reverts commit d6fb8873efcf06c416b65b35cea0b2d4cfdaff94.