This reverts commit dc9d5b7e.

1.23 was actually older than 1.3.1; upsteam wasn't using proper
monotic versions. Reverting this merge so that we can properly see
the differences between the latest and previous releases.

Upstream version 2.0.0