Revert last 6 premature commits