An effort to roll back some logic, simplify.
Add version test.