Add separate conditions to accommodate no patchlevel 2.1.0
Revert rubyversion method, remove patchlevel from 2.1.0