Drop manifest version to 2 from 3. Missed that in the previous merge.