Remove nasty lib hacks from facts-side PR