Trying to fix hotboot bug with MCCP2.