Revert 10418be016c7ecc918574666905f6d586be17c22^..HEAD