Reapply Keenan's RB changes