Pro civ starting epic warehouse not repackable

In the old game you always had one warehouse in each civ that wasn' repackable. However, celeste is treating the starting epic one, AND the the other as repackable. Leaving pro civs with two capital city warehouses that are unpackable. The epic one should be repackable, but untradeable and unsellable. Requiring the player to destroy it, and build another 24 slot warehouse.