Revert to b59d3771f.