Revert last 3 commits made in error. Proper versions will come later