Partially revert 283ee16
Switch to single integer for versioning options array
Changelog and version number bump