Move fabric patching to bootstrap