With counter-terrorism, I would hope companies then have a contingency plan for governments imminently banning laptops on international flights.

With global inventories, it shouldn't be that hard for major vendors like Dell or Apple to offer an identical configuration to drop a hard drive into.