Restore null version support for now