Stack housekeeping repair for last checkin.