rest of missing cherry pick

tried not to commit whitespace changes… whoops.