Commit forgotten chunk of r270264.