Return everything to normal, except for __key

that's still needed to figure out which one to use