Revert new version until further fixes