Revert 375ef5c566fb476f65c0a1c986e982ef24c6ba7d