JB-MR2: Keep manifest as stock as possible

Only for NS for now