Redo the version check, be more principled and rebase
Redo the version check, be more principled and rebase

ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake