Hopefully fixed sapling metadata quirkiness