Request for Changes-66: Flip the OTB sandwich