More awful hacking around version numbers.

Change-Id: I8d53625dcb170f1b3732cf2b2302273d85c3e6c9