Merge "Revert "Fix build numbers""