Revert revert 938171

Add version helper mock