Use shfs fixes from #1530, unmark as broken