Merge "Simplify the way we get the version info. Reduces startup overhead."