Reverting package number to keep parity with upstream