Revert accidental merge of the mainline branch.

The merge was unintentional, .. this is trying to undo the damage.