Revert latest merge
Revert additional merge