Revert b99a577a2314fc8ad02dfca111f03fe390c564c4