Structure blocks load previously non-waterlogged blocks as waterlogged

If you save structures in the world with non-waterlogged blocks surrounding water then when the structure is loaded those blocks become waterlogged (breaking redstone contraptions!).